Merge from emacs-23; up to r100454.
authorGlenn Morris <rgm@gnu.org>
Sat, 5 Feb 2011 22:30:14 +0000 (14:30 -0800)
committerGlenn Morris <rgm@gnu.org>
Sat, 5 Feb 2011 22:30:14 +0000 (14:30 -0800)
commitb4e99ab2e48d6ec32683ee55fcb757b3ca8e81bf
tree61350bd52cb83bbe31dde9399eaa55a8d97d78bf
parent79d01ccb5595749bebe9dd2dc10d7cf6cc32ea43
parent92b35af1fcea1bdb57d93f38ffc63046d81eadcc
Merge from emacs-23; up to r100454.
19 files changed:
doc/emacs/ChangeLog
doc/emacs/custom.texi
doc/emacs/maintaining.texi
doc/emacs/rmail.texi
doc/lispref/ChangeLog
doc/lispref/commands.texi
etc/NEWS.23
lisp/ChangeLog
lisp/calendar/diary-lib.el
lisp/emacs-lisp/cl-macs.el
lisp/faces.el
lisp/ibuf-ext.el
lisp/progmodes/f90.el
src/ChangeLog
src/editfns.c
src/ftfont.c
src/window.c
src/xfaces.c
src/xftfont.c